| @@ -86,7 +86,7 @@ | ||
| 86 | 86 | color: #999; | 
| 87 | 87 | } | 
| 88 | 88 |  | 
| 89 | -        .mask-thump>img { | |
| 89 | +        .mask-thump > img { | |
| 90 | 90 | position: absolute; | 
| 91 | 91 | right: 10px; | 
| 92 | 92 | bottom: 10px; | 
| @@ -107,9 +107,11 @@ | ||
| 107 | 107 | box-sizing: border-box; | 
| 108 | 108 | z-index: 99999; | 
| 109 | 109 | } | 
| 110 | + | |
| 110 | 111 |          .nomark-buy { | 
| 111 | 112 | left: 0; | 
| 112 | 113 | } | 
| 114 | + | |
| 113 | 115 |          .origin-buy { | 
| 114 | 116 | right: 0; | 
| 115 | 117 | } | 
| @@ -119,16 +121,16 @@ | ||
| 119 | 121 | <div> | 
| 120 | 122 | <div id="photos"> | 
| 121 | 123 | <div id="left" class="halfscreen" style="float: left;"> | 
| 122 | -{#            <img src="https://placekitten.com/600/400" data-idx="0">#} | |
| 123 | -{#            <img src="https://placekitten.com/1200/900" data-idx="2">#} | |
| 124 | +            {#            <img src="https://placekitten.com/600/400" data-idx="0">#} | |
| 125 | +            {#            <img src="https://placekitten.com/1200/900" data-idx="2">#} | |
| 124 | 126 | </div> | 
| 125 | 127 | <div id="right" class="halfscreen" style="float: right;"> | 
| 126 | -{#            <img src="https://placekitten.com/1200/900" data-idx="1">#} | |
| 127 | -{#            <img src="https://placekitten.com/600/400" data-idx="3">#} | |
| 128 | +            {#            <img src="https://placekitten.com/1200/900" data-idx="1">#} | |
| 129 | +            {#            <img src="https://placekitten.com/600/400" data-idx="3">#} | |
| 128 | 130 | </div> | 
| 129 | 131 | </div> | 
| 130 | 132 | <div id="mask-thump" class="mask-thump"> | 
| 131 | - <img class="" src="../../static/img/thumbup.png" /> | |
| 133 | + <img class="" src="../../static/img/thumbup.png"/> | |
| 132 | 134 | </div> | 
| 133 | 135 | <div id="buy" style="display:none"> | 
| 134 | 136 | <div id="nomark" class="nomark-buy">去除水印</div> | 
| @@ -993,20 +995,20 @@ | ||
| 993 | 995 |              for (var j = 0; j < photos.length; j++) { | 
| 994 | 996 | photoHeight = photos[j].photo_thumbnail_h / photos[j].photo_thumbnail_w * photoWidth; | 
| 995 | 997 | var header = ( | 
| 996 | - '<div class="photo-top">' + | |
| 998 | + '<div class="photo-top">' + | |
| 997 | 999 |                          '<img class="group-avatar float-left" src="../../static/img/fruits/{0}.png" />' + | 
| 998 | 1000 |                          '<text class="group-name float-left">{1}</text>' + | 
| 999 | 1001 |                          '<text class="section-text float-right">{2}</text>' + | 
| 1000 | - '</div>' | |
| 1002 | + '</div>' | |
| 1001 | 1003 | ).format(GROUP_AVATAR_LIST[photos[j].group_default_avatar], photos[j].group_name, fromNow(photos[j].created_at)); | 
| 1002 | 1004 |                  var imgctx = '<img src="{0}" data-idx="{1}" style="width:{2}px;height:{3}px">'.format(photos[j].photo_thumbnail_url, photoIdx, photoWidth, photoHeight); | 
| 1003 | 1005 | var footer = ( | 
| 1004 | - '<div class="photo-bottom">' + | |
| 1006 | + '<div class="photo-bottom">' + | |
| 1005 | 1007 | '<img class="section-icon float-left" src="../../static/img/thumbup.png" />' + | 
| 1006 | 1008 |                          '<text class="thump-comment-num float-left">{0}</text>' + | 
| 1007 | 1009 | '<img class="section-icon float-left" src="../../static/img/comment.png" />' + | 
| 1008 | 1010 |                          '<text class="thump-comment-num float-left">{1}</text>' + | 
| 1009 | - '</div>' | |
| 1011 | + '</div>' | |
| 1010 | 1012 | ).format(photos[j].thumbup_num, photos[j].comment_num); | 
| 1011 | 1013 |                  if (leftHeight > rightHeight) { | 
| 1012 | 1014 | rightHeight += photoHeight + 72; | 
| @@ -1056,14 +1058,14 @@ | ||
| 1056 | 1058 |  | 
| 1057 | 1059 | // After slides change | 
| 1058 | 1060 | // (after content changed) | 
| 1059 | -            gallery.listen('afterChange', function() { | |
| 1061 | +            gallery.listen('afterChange', function () { | |
| 1060 | 1062 | console.log(gallery.getCurrentIndex()); | 
| 1061 | 1063 | curIdx = gallery.getCurrentIndex(); | 
| 1062 | 1064 | displayornot() | 
| 1063 | 1065 | }); | 
| 1064 | 1066 |  | 
| 1065 | 1067 | // Gallery starts closing | 
| 1066 | -            gallery.listen('close', function() { | |
| 1068 | +            gallery.listen('close', function () { | |
| 1067 | 1069 |                  $('#buy').hide(); | 
| 1068 | 1070 |                  $('#mask-thump').hide(); | 
| 1069 | 1071 | }); | 
| @@ -28,7 +28,7 @@ from utils.wx_utils import get_trade_type, get_user_openid | ||
| 28 | 28 | WECHAT = settings.WECHAT | 
| 29 | 29 |  | 
| 30 | 30 |  | 
| 31 | -@logit | |
| 31 | +@logit(res=True) | |
| 32 | 32 | @transaction.atomic | 
| 33 | 33 | def wx_order_create_api(request): | 
| 34 | 34 | """ 订单创建 """ |